match lowering: handle or-patterns one layer at a time #122046
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
Nadrieril
force-pushed
the
integrate-or-pats2
branch
from
1d7c466 to
c7a1c2b
Compare
This comment was marked as resolved.
This comment was marked as resolved.
Nadrieril
force-pushed
the
integrate-or-pats2
branch
from
c7a1c2b to
bd0334f
Compare
|
Gentle ping on this one, I got a few things blocked on it |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 26, 2024
…i-obk match lowering: consistently merge simple or-patterns There are two places where we expand or-patterns in match lowering: the main one is `test_candidates_with_or`, and there's one in `match_candidates` that's an optimization for the simple case where the whole pattern is just one or-pattern. To reduce duplication, we merge or-pattern alternatives into a single block when possible, but we only to that in `test_candidates_with_or`. This PR fixes this oversight and merges them in `match_candidates` too. This is a part of splitting up rust-lang#122046 into smaller bits.
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 26, 2024
Rollup merge of rust-lang#123067 - Nadrieril:always-simplify-or, r=oli-obk match lowering: consistently merge simple or-patterns There are two places where we expand or-patterns in match lowering: the main one is `test_candidates_with_or`, and there's one in `match_candidates` that's an optimization for the simple case where the whole pattern is just one or-pattern. To reduce duplication, we merge or-pattern alternatives into a single block when possible, but we only to that in `test_candidates_with_or`. This PR fixes this oversight and merges them in `match_candidates` too. This is a part of splitting up rust-lang#122046 into smaller bits.
This comment has been minimized.
This comment has been minimized.
By calling back into `match_candidates`, we only need to expand one layer at a time. Conversely, since we always try to simplify a layer that we just expanded, we only have to merge one layer at a time.
Nadrieril
force-pushed
the
integrate-or-pats2
branch
2 times, most recently
from
15de647 to
23c9f69
Compare
|
r? @oli-obk |
|
Sorry about taking so long on this |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (6bb6b81): comparison URL. Overall result: ✅ improvements - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Binary sizeThis benchmark run did not return any relevant results for this metric. Bootstrap: 669.305s -> 667.497s (-0.27%) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
create_or_subcandidatesandmerge_trivial_subcandidatesboth call themselves recursively to handle nested or-patterns, which is hard to follow. In this PR I avoid the need for that; we now process a single "layer" of or-patterns at a time.By calling back into
match_candidates, we only need to expand one layer at a time. Conversely, since we always try to simplify a layer that we just expanded (thanks to #123067), we only have to merge one layer at a time.r? @matthewjasper